Make jasper support optional

To enable it, one must now pass --with-libjasper to configure.

diff --git a/README.in b/README.in
index 4fb241711216a9888a16200709f6c6ad1cf028a8..c92639ba41b69f3f5dd799b5220ffc34b93d88a3 100644 (file)
--- a/README.in
+++ b/README.in
@@ -34,6 +34,9 @@ Release notes for 2.18
   old custom_widget. Custom_widget does not get destroyed when the
   tooltip goes away.
 
+* JPEG2000 support is no longer enabled by default. It must be
+  explicitly turned on, by passing --with-libjasper to configure.
+
 
 Release notes for 2.16
 ======================

diff --git a/configure.in b/configure.in
index e31eea89b9ecba87ea89c5c14be5edf9b9249e94..6acbb4914946b45e7a06eca53382f4cd4e427672 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -825,8 +825,8 @@ AC_ARG_WITH(libtiff,
             [AC_HELP_STRING([--without-libtiff],
                             [disable TIFF loader for gdk-pixbuf])])
 AC_ARG_WITH(libjasper,
-            [AC_HELP_STRING([--without-libjasper],
-                            [disable JPEG2000 loader for gdk-pixbuf])])
+            [AC_HELP_STRING([--with-libjasper],
+                            [enable JPEG2000 loader for gdk-pixbuf])])
 
 AC_ARG_ENABLE(gdiplus,
             [AC_HELP_STRING([--enable-gdiplus],
@@ -941,11 +941,11 @@ dnl Test for libpng
   fi
 
 dnl Test for libjasper
-  if test x$with_libjasper != xno && test -z "$LIBJASPER"; then
+  if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
     AC_CHECK_LIB(jasper, jas_init, LIBJASPER=-ljasper, [], -ljpeg)
   fi
 
-  if test x$with_libjasper != xno && test -z "$LIBJASPER"; then
+  if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
      AC_MSG_ERROR([
 *** Checks for JPEG2000 loader failed. You can build without it by passing 
 *** --without-libjasper to configure])